From 4e41b5c5fd1ee243e429520a94077c52d5f8df3b Mon Sep 17 00:00:00 2001 From: Carlos Garcia Campos Date: Wed, 25 Jan 2012 18:59:43 +0100 Subject: [PATCH] gtktextview: Use symbolic names for button numbers --- gtk/gtktextview.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c index 95e63a7bdb..61961ecfe6 100644 --- a/gtk/gtktextview.c +++ b/gtk/gtktextview.c @@ -4540,9 +4540,9 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event) #if 0 /* debug hack */ - if (event->button == 3 && (event->state & GDK_CONTROL_MASK) != 0) + if (event->button == GDK_BUTTON_SECONDARY && (event->state & GDK_CONTROL_MASK) != 0) _gtk_text_buffer_spew (GTK_TEXT_VIEW (widget)->buffer); - else if (event->button == 3) + else if (event->button == GDK_BUTTON_SECONDARY) gtk_text_layout_spew (GTK_TEXT_VIEW (widget)->layout); #endif @@ -4555,7 +4555,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event) gtk_text_view_do_popup (text_view, event); return TRUE; } - else if (event->button == 1) + else if (event->button == GDK_BUTTON_PRIMARY) { /* If we're in the selection, start a drag copy/move of the * selection; otherwise, start creating a new selection. @@ -4586,7 +4586,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event) return TRUE; } - else if (event->button == 2) + else if (event->button == GDK_BUTTON_MIDDLE) { GtkTextIter iter; @@ -4608,7 +4608,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event) } else if ((event->type == GDK_2BUTTON_PRESS || event->type == GDK_3BUTTON_PRESS) && - event->button == 1) + event->button == GDK_BUTTON_PRIMARY) { GtkTextIter iter; @@ -4638,7 +4638,7 @@ gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event) if (event->window != priv->text_window->bin_window) return FALSE; - if (event->button == 1) + if (event->button == GDK_BUTTON_PRIMARY) { if (priv->drag_start_x >= 0) { -- 2.30.2